Prefer using pragma once

Similar to what we did in mutter

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3507>
(cherry picked from commit 5cbd847c842da04cf0dc82106f084c09f1c4e350)

diff --git a/src/calendar-server/calendar-debug.h b/src/calendar-server/calendar-debug.h
index 39befd744bfcc86ca437d9c930e13939cb2bed89..db3c0d98128a9f7913cdc7a1b8889701a14019b2 100644 (file)
--- a/src/calendar-server/calendar-debug.h
+++ b/src/calendar-server/calendar-debug.h
@@ -18,8 +18,7 @@
  *     Mark McLoughlin  <mark@skynet.ie>
  */
 
-#ifndef __CALENDAR_DEBUG_H__
-#define __CALENDAR_DEBUG_H__
+#pragma once
 
 #include <glib.h>
 
@@ -46,5 +45,3 @@ G_BEGIN_DECLS
 #endif /* CALENDAR_ENABLE_DEBUG */
 
 G_END_DECLS
-
-#endif /* __CALENDAR_DEBUG_H__ */

diff --git a/src/calendar-server/calendar-sources.h b/src/calendar-server/calendar-sources.h
index 1ffc8ad01df814233940e013de4dcddd006be92b..97520f7d8432310b5854787256c8076676e06213 100644 (file)
--- a/src/calendar-server/calendar-sources.h
+++ b/src/calendar-server/calendar-sources.h
@@ -21,8 +21,7 @@
  *     Christian Kellner  <gicmo@xatom.net>
  */
 
-#ifndef __CALENDAR_SOURCES_H__
-#define __CALENDAR_SOURCES_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -60,5 +59,3 @@ void            print_debug                          (const gchar *str,
                                                       ...) G_GNUC_PRINTF (1, 2);
 
 G_END_DECLS
-
-#endif /* __CALENDAR_SOURCES_H__ */

diff --git a/src/gtkactionmuxer.h b/src/gtkactionmuxer.h
index d71abf48dd75cccf17bde8930c23ea18b07679c9..8e9dfeccaa19ea9dcc060e4a79a584edea5b13af 100644 (file)
--- a/src/gtkactionmuxer.h
+++ b/src/gtkactionmuxer.h
@@ -17,8 +17,7 @@
  * Author: Ryan Lortie <desrt@desrt.ca>
  */
 
-#ifndef __GTK_ACTION_MUXER_H__
-#define __GTK_ACTION_MUXER_H__
+#pragma once
 
 #include <gio/gio.h>
 
@@ -60,5 +59,3 @@ gchar *                 gtk_print_action_and_target                     (const g
                                                                          GVariant       *target);
 
 G_END_DECLS
-
-#endif /* __GTK_ACTION_MUXER_H__ */

diff --git a/src/gtkactionobservable.h b/src/gtkactionobservable.h
index aa1514b3c9739dab2fd25ae47964df1368e44284..c754bb9fe9199263f1126a06312846764a34122c 100644 (file)
--- a/src/gtkactionobservable.h
+++ b/src/gtkactionobservable.h
@@ -17,8 +17,7 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
-#ifndef __GTK_ACTION_OBSERVABLE_H__
-#define __GTK_ACTION_OBSERVABLE_H__
+#pragma once
 
 #include "gtkactionobserver.h"
 
@@ -56,5 +55,3 @@ void                    gtk_action_observable_unregister_observer       (GtkActi
                                                                          GtkActionObserver   *observer);
 
 G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVABLE_H__ */

diff --git a/src/gtkactionobserver.h b/src/gtkactionobserver.h
index a4e9659c23604ee0a85471163d791c3bc0fd1989..1f861671a45c276fb6aedd58a2c79e2d9c4091e4 100644 (file)
--- a/src/gtkactionobserver.h
+++ b/src/gtkactionobserver.h
@@ -17,8 +17,7 @@
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
-#ifndef __GTK_ACTION_OBSERVER_H__
-#define __GTK_ACTION_OBSERVER_H__
+#pragma once
 
 #include <gio/gio.h>
 
@@ -87,5 +86,3 @@ void                    gtk_action_observer_primary_accel_changed       (GtkActi
                                                                          const gchar         *action_and_target);
 
 G_END_DECLS
-
-#endif /* __GTK_ACTION_OBSERVER_H__ */

diff --git a/src/hotplug-sniffer/hotplug-mimetypes.h b/src/hotplug-sniffer/hotplug-mimetypes.h
index b034020074d1df56030b554b10a2ad7d9ab05391..9e1e944632b7198141aa196495e9f99560d8725f 100644 (file)
--- a/src/hotplug-sniffer/hotplug-mimetypes.h
+++ b/src/hotplug-sniffer/hotplug-mimetypes.h
@@ -1,7 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#ifndef __HOTPLUG_MIMETYPES_H__
-#define __HOTPLUG_MIMETYPES_H__
+#pragma once
 
 #include <glib.h>
 
@@ -137,5 +136,3 @@ G_GNUC_UNUSED static const gchar *audio_mimetypes[] = {
   "audio/x-xm",
   NULL
 };
-
-#endif /* __HOTPLUG_MIMETYPES_H__ */

diff --git a/src/hotplug-sniffer/shell-mime-sniffer.h b/src/hotplug-sniffer/shell-mime-sniffer.h
index 3936eef14a18c572f8c4f34fdc792ed47368fc14..640d491948e4cecbd3a96de5cc516638c5aa8700 100644 (file)
--- a/src/hotplug-sniffer/shell-mime-sniffer.h
+++ b/src/hotplug-sniffer/shell-mime-sniffer.h
@@ -19,8 +19,7 @@
  *
  */
 
-#ifndef __SHELL_MIME_SNIFFER_H__
-#define __SHELL_MIME_SNIFFER_H__
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -42,5 +41,3 @@ gchar ** shell_mime_sniffer_sniff_finish (ShellMimeSniffer *self,
                                           GError **error);
 
 G_END_DECLS
-
-#endif /* __SHELL_MIME_SNIFFER_H__ */

diff --git a/src/shell-app-cache-private.h b/src/shell-app-cache-private.h
index b73094ab18082c7e839f1e279d12b0631b5ece89..6afdd344523db11e2394079435cbcf6bd025436e 100644 (file)
--- a/src/shell-app-cache-private.h
+++ b/src/shell-app-cache-private.h
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_APP_CACHE_PRIVATE_H__
-#define __SHELL_APP_CACHE_PRIVATE_H__
+
+#pragma once
 
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
@@ -15,5 +15,3 @@ GDesktopAppInfo *shell_app_cache_get_info         (ShellAppCache *cache,
                                                    const char    *id);
 char            *shell_app_cache_translate_folder (ShellAppCache *cache,
                                                    const char    *name);
-
-#endif /* __SHELL_APP_CACHE_PRIVATE_H__ */

diff --git a/src/shell-app-private.h b/src/shell-app-private.h
index b1786b319c7c395aa8af394f7379655a7e2eda1c..772a2ae87ed0a9c2d06339a2ecf0676a09526a67 100644 (file)
--- a/src/shell-app-private.h
+++ b/src/shell-app-private.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_APP_PRIVATE_H__
-#define __SHELL_APP_PRIVATE_H__
+#pragma once
 
 #include "shell-app.h"
 #include "shell-app-system.h"
@@ -20,5 +19,3 @@ void _shell_app_add_window (ShellApp *app, MetaWindow *window);
 void _shell_app_remove_window (ShellApp *app, MetaWindow *window);
 
 G_END_DECLS
-
-#endif /* __SHELL_APP_PRIVATE_H__ */

diff --git a/src/shell-app-system-private.h b/src/shell-app-system-private.h
index 975d563def74cf12908f90e1e5fc7db2e2d541f6..624ed1ab2950cbf2882fb80390f7c4220add5fe3 100644 (file)
--- a/src/shell-app-system-private.h
+++ b/src/shell-app-system-private.h
@@ -1,9 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_APP_SYSTEM_PRIVATE_H__
-#define __SHELL_APP_SYSTEM_PRIVATE_H__
+#pragma once
 
 #include "shell-app-system.h"
 
 void _shell_app_system_notify_app_state_changed (ShellAppSystem *self, ShellApp *app);
-
-#endif

diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 8719dbcf2d6c0414134853c5085805766bfc3865..675b1df0dff72ab6eecc53bc8978d180bda89075 100644 (file)
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_APP_SYSTEM_H__
-#define __SHELL_APP_SYSTEM_H__
+#pragma once
 
 #include <gio/gio.h>
 #include <clutter/clutter.h>
@@ -28,5 +27,3 @@ GSList         *shell_app_system_get_running               (ShellAppSystem  *sel
 char         ***shell_app_system_search                    (const char *search_string);
 
 GList          *shell_app_system_get_installed             (ShellAppSystem  *self);
-
-#endif /* __SHELL_APP_SYSTEM_H__ */

diff --git a/src/shell-app-usage.h b/src/shell-app-usage.h
index 4b0e1691a16bc7efba69f92a5eff12afe99d7958..9475b60449a2be1cf5ca10b29e617d4c7f4327b0 100644 (file)
--- a/src/shell-app-usage.h
+++ b/src/shell-app-usage.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_APP_USAGE_H__
-#define __SHELL_APP_USAGE_H__
+#pragma once
 
 #include "shell-app.h"
 #include "shell-window-tracker.h"
@@ -19,5 +18,3 @@ int shell_app_usage_compare (ShellAppUsage *self,
                              const char    *id_b);
 
 G_END_DECLS
-
-#endif /* __SHELL_APP_USAGE_H__ */

diff --git a/src/shell-app.h b/src/shell-app.h
index a3e087eaed67d0a337a253ade223333c8947c057..aa67847b2adaaf2fc79e378a3ed2535204d43fa6 100644 (file)
--- a/src/shell-app.h
+++ b/src/shell-app.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_APP_H__
-#define __SHELL_APP_H__
+#pragma once
 
 #include <clutter/clutter.h>
 #include <gio/gio.h>
@@ -92,5 +91,3 @@ void shell_app_update_app_actions    (ShellApp *app, MetaWindow *window);
 gboolean shell_app_get_busy          (ShellApp *app);
 
 G_END_DECLS
-
-#endif /* __SHELL_APP_H__ */

diff --git a/src/shell-camera-monitor.h b/src/shell-camera-monitor.h
index 9f981168656415439500cbe5f00164f750bceaac..558e3c463cb021162e67692c7d8edb96f96943f5 100644 (file)
--- a/src/shell-camera-monitor.h
+++ b/src/shell-camera-monitor.h
@@ -19,8 +19,7 @@
  * 02111-1307, USA.
  */
 
-#ifndef __SHELL_CAMERA_MONITOR_H__
-#define __SHELL_CAMERA_MONITOR_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -31,5 +30,3 @@ G_DECLARE_FINAL_TYPE (ShellCameraMonitor, shell_camera_monitor,
                       SHELL, CAMERA_MONITOR, GObject)
 
 G_END_DECLS
-
-#endif /* __SHELL_CAMERA_MONITOR_H__ */

diff --git a/src/shell-global-private.h b/src/shell-global-private.h
index 8ba21189898f9d25dc555b8ccebe36a3147e284a..59a3ecc8d6fe0d0818818fe3f235877cf5a2b0ca 100644 (file)
--- a/src/shell-global-private.h
+++ b/src/shell-global-private.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_GLOBAL_PRIVATE_H__
-#define __SHELL_GLOBAL_PRIVATE_H__
+#pragma once
 
 #include "shell-global.h"
 
@@ -22,5 +21,3 @@ ShellAppCache * shell_global_get_app_cache (ShellGlobal *global);
 void _shell_global_locate_pointer (ShellGlobal  *global);
 
 void _shell_global_notify_shutdown (ShellGlobal *global);
-
-#endif /* __SHELL_GLOBAL_PRIVATE_H__ */

diff --git a/src/shell-global.h b/src/shell-global.h
index 8399330236e16a0476ed1890fb370be52ee14c29..715764a4934f848e8bc55233069d937aef9f2b38 100644 (file)
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_GLOBAL_H__
-#define __SHELL_GLOBAL_H__
+#pragma once
 
 #include <clutter/clutter.h>
 #include <glib-object.h>
@@ -100,5 +99,3 @@ ShellAppSystem *     shell_global_get_app_system     (ShellGlobal *global);
 ShellAppUsage *      shell_global_get_app_usage      (ShellGlobal *global);
 
 G_END_DECLS
-
-#endif /* __SHELL_GLOBAL_H__ */

diff --git a/src/shell-glsl-effect.h b/src/shell-glsl-effect.h
index d6d687b7649f40bc9c1ac0ccb1b94acac9eb1529..10b70e13c11b7603471935b3a98610c973701b82 100644 (file)
--- a/src/shell-glsl-effect.h
+++ b/src/shell-glsl-effect.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_GLSL_EFFECT_H__
-#define __SHELL_GLSL_EFFECT_H__
+#pragma once
 
 #include "st.h"
 
@@ -57,5 +56,3 @@ void shell_glsl_effect_set_uniform_matrix   (ShellGLSLEffect *effect,
                                              int              dimensions,
                                              int              total_count,
                                              const float     *value);
-
-#endif /* __SHELL_GLSL_EFFECT_H__ */

diff --git a/src/shell-invert-lightness-effect.h b/src/shell-invert-lightness-effect.h
index 3d7cf3a6d665ee1b50b0712fd946d29a4e6be5e1..5340140716f8c1caa4fd84ab8ae3826f365fa52d 100644 (file)
--- a/src/shell-invert-lightness-effect.h
+++ b/src/shell-invert-lightness-effect.h
@@ -18,8 +18,7 @@
  * Author:
  *   Joseph Scheuhammer <clown@alum.mit.edu>
  */
-#ifndef __SHELL_INVERT_LIGHTNESS_EFFECT_H__
-#define __SHELL_INVERT_LIGHTNESS_EFFECT_H__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -37,5 +36,3 @@ GType shell_invert_lightness_effect_get_type (void) G_GNUC_CONST;
 ClutterEffect *shell_invert_lightness_effect_new (void);
 
 G_END_DECLS
-
-#endif /* __SHELL_INVERT_LIGHTNESS_EFFECT_H__ */

diff --git a/src/shell-keyring-prompt.h b/src/shell-keyring-prompt.h
index fcacf4c572351b600070811adeebfdfb9408b7a9..f217310bc9ef99dca03ee3d8ef259b0b52d9c276 100644 (file)
--- a/src/shell-keyring-prompt.h
+++ b/src/shell-keyring-prompt.h
@@ -20,8 +20,7 @@
    Author: Stef Walter <stef@thewalter.net>
 */
 
-#ifndef __SHELL_KEYRING_PROMPT_H__
-#define __SHELL_KEYRING_PROMPT_H__
+#pragma once
 
 #include <glib-object.h>
 #include <glib.h>
@@ -53,5 +52,3 @@ gboolean             shell_keyring_prompt_complete             (ShellKeyringProm
 void                 shell_keyring_prompt_cancel               (ShellKeyringPrompt *self);
 
 G_END_DECLS
-
-#endif /* __SHELL_KEYRING_PROMPT_H__ */

diff --git a/src/shell-mount-operation.h b/src/shell-mount-operation.h
index c4019a5f0ada277e36f303af40f51427b15b3a60..cc74e1a631042f417bc0657e1e0ecdcbb7ef20f6 100644 (file)
--- a/src/shell-mount-operation.h
+++ b/src/shell-mount-operation.h
@@ -19,8 +19,7 @@
  *
  */
 
-#ifndef __SHELL_MOUNT_OPERATION_H__
-#define __SHELL_MOUNT_OPERATION_H__
+#pragma once
 
 #include <gio/gio.h>
 
@@ -37,5 +36,3 @@ gchar ** shell_mount_operation_get_show_processes_choices (ShellMountOperation *
 gchar * shell_mount_operation_get_show_processes_message (ShellMountOperation *self);
 
 G_END_DECLS
-
-#endif /* __SHELL_MOUNT_OPERATION_H__ */

diff --git a/src/shell-network-agent.h b/src/shell-network-agent.h
index 0ffde027436660ddffb14ef788bc60a295dbf667..05da23dcb78c08a5148f05d95202d3b280387efd 100644 (file)
--- a/src/shell-network-agent.h
+++ b/src/shell-network-agent.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_NETWORK_AGENT_H__
-#define __SHELL_NETWORK_AGENT_H__
+#pragma once
 
 #include <glib-object.h>
 #include <glib.h>
@@ -69,5 +68,3 @@ NMVpnPluginInfo   *shell_network_agent_search_vpn_plugin_finish (ShellNetworkAge
 #define SHELL_KEYRING_SK_TAG "setting-key"
 
 G_END_DECLS
-
-#endif /* __SHELL_NETWORK_AGENT_H__ */

diff --git a/src/shell-perf-log.h b/src/shell-perf-log.h
index 45d07a591f69ca6d6067ff7f594ec8e8172e46f8..b85eb0adbfcdf6596c71b5c1e9110e68e0d43a5e 100644 (file)
--- a/src/shell-perf-log.h
+++ b/src/shell-perf-log.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_PERF_LOG_H__
-#define __SHELL_PERF_LOG_H__
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -71,5 +70,3 @@ gboolean shell_perf_log_dump_log    (ShellPerfLog   *perf_log,
                                      GError        **error);
 
 G_END_DECLS
-
-#endif /* __SHELL_PERF_LOG_H__ */

diff --git a/src/shell-polkit-authentication-agent.h b/src/shell-polkit-authentication-agent.h
index 4f14749563d2db3925cd2be21d0cb0d54ce79e01..e4fccda9800c5fa9c32d6542cdf7df2e45c35b4b 100644 (file)
--- a/src/shell-polkit-authentication-agent.h
+++ b/src/shell-polkit-authentication-agent.h
@@ -32,4 +32,3 @@ void                            shell_polkit_authentication_agent_register (Shel
 void                            shell_polkit_authentication_agent_unregister (ShellPolkitAuthenticationAgent *agent);
 
 G_END_DECLS
-

diff --git a/src/shell-screenshot.h b/src/shell-screenshot.h
index 609ffef2a3e440fee39d104f9e8ed44473074f01..248d34fea9d0da85cf33fa7f783958ddadd1a906 100644 (file)
--- a/src/shell-screenshot.h
+++ b/src/shell-screenshot.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_SCREENSHOT_H__
-#define __SHELL_SCREENSHOT_H__
+#pragma once
 
 #include <mtk/mtk.h>
 
@@ -88,5 +87,3 @@ void shell_screenshot_composite_to_stream (CoglTexture         *texture,
                                            gpointer             user_data);
 GdkPixbuf *shell_screenshot_composite_to_stream_finish (GAsyncResult  *result,
                                                         GError       **error);
-
-#endif /* ___SHELL_SCREENSHOT_H__ */

diff --git a/src/shell-secure-text-buffer.h b/src/shell-secure-text-buffer.h
index 6685b72ad1c9302a32e9be9765fca663fb7e0c84..f5b68a29b334823332c514f4451b5bf0a9c65664 100644 (file)
--- a/src/shell-secure-text-buffer.h
+++ b/src/shell-secure-text-buffer.h
@@ -21,8 +21,7 @@
    Author: Stef Walter <stefw@gnome.org>
 */
 
-#ifndef __SHELL_SECURE_TEXT_BUFFER_H__
-#define __SHELL_SECURE_TEXT_BUFFER_H__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -35,5 +34,3 @@ G_DECLARE_FINAL_TYPE (ShellSecureTextBuffer, shell_secure_text_buffer,
 ClutterTextBuffer *       shell_secure_text_buffer_new                    (void);
 
 G_END_DECLS
-
-#endif /* __SHELL_SECURE_TEXT_BUFFER_H__ */

diff --git a/src/shell-square-bin.h b/src/shell-square-bin.h
index 2b7d4b23654cadce08a0cf9ef8492acdeca3bba6..1fd547d31a35a677bdc06681cdbdd756d1662e90 100644 (file)
--- a/src/shell-square-bin.h
+++ b/src/shell-square-bin.h
@@ -1,5 +1,5 @@
-#ifndef __SHELL_SQUARE_BIN_H__
-#define __SHELL_SQUARE_BIN_H__
+#pragma once
+
 
 #include <st/st.h>
 
@@ -9,5 +9,3 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (ShellSquareBin, shell_square_bin, SHELL, SquareBin, StBin)
 
 G_END_DECLS
-
-#endif /* __SHELL_SQUARE_BIN_H__ */

diff --git a/src/shell-stack.h b/src/shell-stack.h
index 6f307694e60cb1c0a0580e41eab14f32c344d4bc..3d6b4f58e5d33d002e2ab00467f607951f4e6ff2 100644 (file)
--- a/src/shell-stack.h
+++ b/src/shell-stack.h
@@ -1,10 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_STACK_H__
-#define __SHELL_STACK_H__
+#pragma once
 
 #include "st.h"
 
 #define SHELL_TYPE_STACK (shell_stack_get_type ())
 G_DECLARE_FINAL_TYPE (ShellStack, shell_stack, SHELL, STACK, StWidget)
-
-#endif /* __SHELL_STACK_H__ */

diff --git a/src/shell-tray-icon-private.h b/src/shell-tray-icon-private.h
index e77ac0aae5a855c299a41b07e441329daa58f040..19f03de3a28b4b854ab85b47613d48c0447eeca8 100644 (file)
--- a/src/shell-tray-icon-private.h
+++ b/src/shell-tray-icon-private.h
@@ -1,11 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef SHELL_TRAY_ICON_PRIVATE_H
-#define SHELL_TRAY_ICON_PRIVATE_H
+#pragma once
 
 #include "shell-tray-icon.h"
 
 #include "na-tray-child.h"
 
 ClutterActor * shell_tray_icon_new (NaTrayChild *tray_child);
-
-#endif /* SHELL_TRAY_ICON_PRIVATE_H */

diff --git a/src/shell-tray-icon.h b/src/shell-tray-icon.h
index 434bd3d12969aa4a19e217b802f0f2ecd4efcafa..29ecb2d8cc77899f03f441bbed747ca366ff931d 100644 (file)
--- a/src/shell-tray-icon.h
+++ b/src/shell-tray-icon.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_TRAY_ICON_H__
-#define __SHELL_TRAY_ICON_H__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -10,5 +9,3 @@ G_DECLARE_FINAL_TYPE (ShellTrayIcon, shell_tray_icon,
 
 void shell_tray_icon_click (ShellTrayIcon *icon,
                             ClutterEvent  *event);
-
-#endif /* __SHELL_TRAY_ICON_H__ */

diff --git a/src/shell-tray-manager.h b/src/shell-tray-manager.h
index d6279d47c695c4b7d1cf98ef049360921bbbcf50..2609e4a0538c7b8f936689d819cbb4f65ed1f815 100644 (file)
--- a/src/shell-tray-manager.h
+++ b/src/shell-tray-manager.h
@@ -1,7 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#ifndef __SHELL_TRAY_MANAGER_H__
-#define __SHELL_TRAY_MANAGER_H__
+#pragma once
 
 #include <clutter/clutter.h>
 #include "st.h"
@@ -18,5 +17,3 @@ void              shell_tray_manager_manage_screen (ShellTrayManager *manager,
 void              shell_tray_manager_unmanage_screen (ShellTrayManager *manager);
 
 G_END_DECLS
-
-#endif /* __SHELL_TRAY_MANAGER_H__ */

diff --git a/src/shell-util.h b/src/shell-util.h
index 8464fbc2b060550d84d7c0f07a930202430d5113..81dd6da54e4e5f32f8d7db3aacb4496e2a7c0143 100644 (file)
--- a/src/shell-util.h
+++ b/src/shell-util.h
@@ -1,7 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#ifndef __SHELL_UTIL_H__
-#define __SHELL_UTIL_H__
+#pragma once
 
 #include <gio/gio.h>
 #include <clutter/clutter.h>
@@ -120,5 +119,3 @@ GPid shell_util_spawn_async (const char          *working_directory,
                              GError             **error);
 
 G_END_DECLS
-
-#endif /* __SHELL_UTIL_H__ */

diff --git a/src/shell-window-preview-layout.h b/src/shell-window-preview-layout.h
index 9376b0da8f83903790ce4711bb9021ee981ab0ae..89eb574f380f285e94aa50050b84aab3ce13548b 100644 (file)
--- a/src/shell-window-preview-layout.h
+++ b/src/shell-window-preview-layout.h
@@ -1,5 +1,4 @@
-#ifndef __SHELL_WINDOW_PREVIEW_LAYOUT_H__
-#define __SHELL_WINDOW_PREVIEW_LAYOUT_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -29,5 +28,3 @@ void  shell_window_preview_layout_remove_window (ShellWindowPreviewLayout  *self
 GList * shell_window_preview_layout_get_windows (ShellWindowPreviewLayout  *self);
 
 G_END_DECLS
-
-#endif /* __SHELL_WINDOW_PREVIEW_LAYOUT_H__ */

diff --git a/src/shell-window-preview.h b/src/shell-window-preview.h
index e50380018bc1b1ec7edd6a259aea10d782e96ccc..53b705b4000ff24e74d1d81e9abcbdcd32ad7ca0 100644 (file)
--- a/src/shell-window-preview.h
+++ b/src/shell-window-preview.h
@@ -1,5 +1,4 @@
-#ifndef __SHELL_WINDOW_PREVIEW_H__
-#define __SHELL_WINDOW_PREVIEW_H__
+#pragma once
 
 #include <st/st.h>
 
@@ -10,5 +9,3 @@ G_DECLARE_FINAL_TYPE (ShellWindowPreview, shell_window_preview,
                       SHELL, WINDOW_PREVIEW, StWidget)
 
 G_END_DECLS
-
-#endif /* __SHELL_WINDOW_PREVIEW_H__ */

diff --git a/src/shell-window-tracker-private.h b/src/shell-window-tracker-private.h
index 4307d153a0d99fce692186f1e645a6a89bc05660..fd5bf886927e8f4ed1e482901847cfad53f77101 100644 (file)
--- a/src/shell-window-tracker-private.h
+++ b/src/shell-window-tracker-private.h
@@ -1,11 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_WINDOW_TRACKER_PRIVATE_H__
-#define __SHELL_WINDOW_TRACKER_PRIVATE_H__
+#pragma once
 
 #include "shell-window-tracker.h"
 
 void _shell_window_tracker_add_child_process_app (ShellWindowTracker *tracker,
                                                   GPid                pid,
                                                   ShellApp           *app);
-
-#endif

diff --git a/src/shell-window-tracker.h b/src/shell-window-tracker.h
index 87c38f882fbfb32080e1b254ba94a30ccf527e70..d9322ed80272a3ab1f1e77982a59895ac5beeab1 100644 (file)
--- a/src/shell-window-tracker.h
+++ b/src/shell-window-tracker.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_WINDOW_TRACKER_H__
-#define __SHELL_WINDOW_TRACKER_H__
+#pragma once
 
 #include <glib-object.h>
 #include <glib.h>
@@ -25,5 +24,3 @@ ShellApp *shell_window_tracker_get_app_from_pid (ShellWindowTracker *tracker, in
 GSList *shell_window_tracker_get_startup_sequences (ShellWindowTracker *tracker);
 
 G_END_DECLS
-
-#endif /* __SHELL_WINDOW_TRACKER_H__ */

diff --git a/src/shell-wm-private.h b/src/shell-wm-private.h
index 1db0ae1a14abdef4d67351ed60169c366059ff5e..72bc4aee4b990807a8c28c739f6e782a6ce1ca0d 100644 (file)
--- a/src/shell-wm-private.h
+++ b/src/shell-wm-private.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_WM_PRIVATE_H__
-#define __SHELL_WM_PRIVATE_H__
+#pragma once
 
 #include "shell-wm.h"
 #include <mtk/mtk.h>
@@ -60,5 +59,3 @@ MetaInhibitShortcutsDialog * _shell_wm_create_inhibit_shortcuts_dialog (ShellWM
                                                                         MetaWindow  *window);
 
 G_END_DECLS
-
-#endif /* __SHELL_WM_PRIVATE_H__ */

diff --git a/src/shell-wm.h b/src/shell-wm.h
index ddfe0958aa5332640b46e3d68e3aa6a76731ea2d..519384dd40fa3ecf4d22322c25738275c2b9c30c 100644 (file)
--- a/src/shell-wm.h
+++ b/src/shell-wm.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __SHELL_WM_H__
-#define __SHELL_WM_H__
+#pragma once
 
 #include <glib-object.h>
 #include <meta/meta-plugin.h>
@@ -28,5 +27,3 @@ void     shell_wm_complete_display_change    (ShellWM         *wm,
                                               gboolean         ok);
 
 G_END_DECLS
-
-#endif /* __SHELL_WM_H__ */

diff --git a/src/shell-workspace-background.h b/src/shell-workspace-background.h
index 48b2bd68fa40bef60739db92fcbe6b32bad8e5e5..441a1ab9446917085afb521d5b93e1edb477b772 100644 (file)
--- a/src/shell-workspace-background.h
+++ b/src/shell-workspace-background.h
@@ -1,5 +1,4 @@
-#ifndef __SHELL_WORKSPACE_BACKGROUND_H__
-#define __SHELL_WORKSPACE_BACKGROUND_H__
+#pragma once
 
 #include <st/st.h>
 
@@ -10,5 +9,3 @@ G_DECLARE_FINAL_TYPE (ShellWorkspaceBackground, shell_workspace_background,
                       SHELL, WORKSPACE_BACKGROUND, StWidget)
 
 G_END_DECLS
-
-#endif /* __SHELL_WORKSPACE_BACKGROUND_H__ */

diff --git a/src/st/croco/cr-additional-sel.h b/src/st/croco/cr-additional-sel.h
index 7ca3e07d53778a2ebd2506117d989d18148603c6..9aba9ecff62ca84223325a7d185dbd9b94237f56 100644 (file)
--- a/src/st/croco/cr-additional-sel.h
+++ b/src/st/croco/cr-additional-sel.h
@@ -21,9 +21,7 @@
  * See the COPYRIGHTS file for copyright information.
  */
 
-
-#ifndef __CR_ADD_SEL_H__
-#define __CR_ADD_SEL_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -94,5 +92,3 @@ void cr_additional_sel_dump (CRAdditionalSel const *a_this, FILE *a_fp) ;
 void cr_additional_sel_destroy (CRAdditionalSel *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_ADD_SEL_H*/

diff --git a/src/st/croco/cr-attr-sel.h b/src/st/croco/cr-attr-sel.h
index 82d5a87d7e36df35eba535ac8c252881ad37a308..7080b7b9b9542dd575fde7d7ceae2a068d0adfc2 100644 (file)
--- a/src/st/croco/cr-attr-sel.h
+++ b/src/st/croco/cr-attr-sel.h
@@ -21,8 +21,7 @@
  * See COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_ATTR_SEL_H__
-#define __CR_ATTR_SEL_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -70,5 +69,3 @@ void cr_attr_sel_dump (CRAttrSel const *a_this, FILE *a_fp) ;
 void cr_attr_sel_destroy (CRAttrSel *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_ATTR_SEL_H__*/

diff --git a/src/st/croco/cr-cascade.h b/src/st/croco/cr-cascade.h
index 3119ae85f3edb555d353b625a4a1cd930a3cfe97..6318043ae190e1610549396015eeb73334d68c1f 100644 (file)
--- a/src/st/croco/cr-cascade.h
+++ b/src/st/croco/cr-cascade.h
@@ -25,8 +25,7 @@
  *$Id$
  */
 
-#ifndef __CR_CASCADE_H__
-#define __CR_CASCADE_H__
+#pragma once
 
 #include "cr-stylesheet.h"
 
@@ -70,5 +69,3 @@ void cr_cascade_unref (CRCascade *a_this) ;
 void cr_cascade_destroy (CRCascade *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_CASCADE_H__*/

diff --git a/src/st/croco/cr-declaration.h b/src/st/croco/cr-declaration.h
index eee8be321c575e1fc15f0b32d5f326e8192e439a..d8267cf17a18ff326da1954eda23497c4c4c70ae 100644 (file)
--- a/src/st/croco/cr-declaration.h
+++ b/src/st/croco/cr-declaration.h
@@ -20,8 +20,7 @@
  * See the COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_DECLARATION_H__
-#define __CR_DECLARATION_H__
+#pragma once
 
 #include <stdio.h>
 #include "cr-utils.h"
@@ -132,5 +131,3 @@ gboolean cr_declaration_unref (CRDeclaration *a_this) ;
 void cr_declaration_destroy (CRDeclaration *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_DECLARATION_H__*/

diff --git a/src/st/croco/cr-doc-handler.h b/src/st/croco/cr-doc-handler.h
index d12673f31308d6ec7fb338b9229ef798a1f8afc9..3643640833b4ee25d959b0a9d84de43057f05d5d 100644 (file)
--- a/src/st/croco/cr-doc-handler.h
+++ b/src/st/croco/cr-doc-handler.h
@@ -20,8 +20,7 @@
  * See the COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_DOC_HANDLER_H__
-#define __CR_DOC_HANDLER_H__
+#pragma once
 
 /**
  *@file
@@ -294,5 +293,3 @@ gboolean cr_doc_handler_unref (CRDocHandler *a_this) ;
 void cr_doc_handler_destroy (CRDocHandler *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_DOC_HANDLER_H__*/

diff --git a/src/st/croco/cr-enc-handler.h b/src/st/croco/cr-enc-handler.h
index 0727764c039fb48e8ce9cf72081fe23a0f389514..382e4371fb896dd98810f8b4ff0c299be4515ab0 100644 (file)
--- a/src/st/croco/cr-enc-handler.h
+++ b/src/st/croco/cr-enc-handler.h
@@ -30,8 +30,7 @@
  *
  */
 
-#ifndef __CR_ENC_HANDLER_H__
-#define __CR_ENC_HANDLER_H__
+#pragma once
 
 #include "cr-utils.h"
 
@@ -90,5 +89,3 @@ cr_enc_handler_convert_input (CREncHandler *a_this,
                               gulong *a_out_len) ;
 
 G_END_DECLS
-
-#endif /*__CR_ENC_HANDLER_H__*/

diff --git a/src/st/croco/cr-fonts.h b/src/st/croco/cr-fonts.h
index 9eaeeeb981efb3292c8f168a4912a8e098981789..39241c3dfa4eacfc7fae5cb31da1c3c9b3a2b670 100644 (file)
--- a/src/st/croco/cr-fonts.h
+++ b/src/st/croco/cr-fonts.h
@@ -23,8 +23,7 @@
  * See COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_FONTS_H__
-#define __CR_FONTS_H__
+#pragma once
 
 #include "cr-utils.h"
 #include "cr-num.h"
@@ -311,5 +310,3 @@ const gchar * cr_font_variant_to_string (enum CRFontVariant a_code) ;
 const gchar * cr_font_stretch_to_string (enum CRFontStretch a_code) ;
 
 G_END_DECLS
-
-#endif

diff --git a/src/st/croco/cr-input.h b/src/st/croco/cr-input.h
index 9eb402a878ea94d180f4122a1863fdb6ada31e57..afc865633e1b33480498251f694aa4467ee28076 100644 (file)
--- a/src/st/croco/cr-input.h
+++ b/src/st/croco/cr-input.h
@@ -21,8 +21,7 @@
  * See the COPYRIGHTS file for copyrights information.
  */
 
-#ifndef __CR_INPUT_SRC_H__
-#define __CR_INPUT_SRC_H__
+#pragma once
 
 
 #include <glib.h>
@@ -169,6 +168,3 @@ enum CRStatus
 cr_input_end_of_input (CRInput const *a_this, gboolean *a_end_of_input) ;
 
 G_END_DECLS
-
-#endif /*__CR_INPUT_SRC_H__*/
-

diff --git a/src/st/croco/cr-num.h b/src/st/croco/cr-num.h
index 2b73aaf797fac9617ac70df62d8e466d432410ea..8353be783b982d6da7477233b6caab9043b81a10 100644 (file)
--- a/src/st/croco/cr-num.h
+++ b/src/st/croco/cr-num.h
@@ -28,8 +28,7 @@
  *of the #CRNum class.
  */
 
-#ifndef __CR_NUM_H__
-#define __CR_NUM_H__
+#pragma once
 
 #include <glib.h>
 #include "cr-utils.h"
@@ -122,6 +121,3 @@ cr_num_destroy (CRNum *a_this) ;
 
 
 G_END_DECLS
-
-
-#endif /*__CR_NUM_H__*/

diff --git a/src/st/croco/cr-om-parser.h b/src/st/croco/cr-om-parser.h
index 13d35b1cd058fb495ea765c5bdab643b14085b67..4204565ee6d9cb14351c1a0c1eb89339b280fd23 100644 (file)
--- a/src/st/croco/cr-om-parser.h
+++ b/src/st/croco/cr-om-parser.h
@@ -25,8 +25,7 @@
  *$Id$
  */
 
-#ifndef __CR_OM_PARSER_H__
-#define __CR_OM_PARSER_H__
+#pragma once
 
 #include "cr-parser.h"
 #include "cr-cascade.h"
@@ -94,5 +93,3 @@ enum CRStatus cr_om_parser_simply_parse_paths_to_cascade (const guchar *a_author
 void cr_om_parser_destroy (CROMParser *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_OM_PARSER_H__*/

diff --git a/src/st/croco/cr-parser.h b/src/st/croco/cr-parser.h
index 6dce9439e1c07896f08905d8d7db2ef9924aa1d1..ae7a9e2f805392894977e6259a272d5ed6981a2f 100644 (file)
--- a/src/st/croco/cr-parser.h
+++ b/src/st/croco/cr-parser.h
@@ -21,8 +21,7 @@
  * See COPYRIGHTS file for copyrights information.
  */
 
-#ifndef __CR_PARSER_H__
-#define  __CR_PARSER_H__
+#pragma once
 
 #include <glib.h>
 #include "cr-input.h"
@@ -124,5 +123,3 @@ enum CRStatus cr_parser_parse_font_face (CRParser *a_this) ;
 void cr_parser_destroy (CRParser *a_this) ;
         
 G_END_DECLS
-
-#endif /*__CR_PARSER_H__*/

diff --git a/src/st/croco/cr-parsing-location.h b/src/st/croco/cr-parsing-location.h
index b8064a56065418596ca0ebf351bc0fdedc0c158c..09bcd800e60cbf8d23e5103b0c1dca89ebeec4d7 100644 (file)
--- a/src/st/croco/cr-parsing-location.h
+++ b/src/st/croco/cr-parsing-location.h
@@ -21,8 +21,7 @@
  * See the COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_PARSING_LOCATION_H__
-#define __CR_PARSING_LOCATION_H__
+#pragma once
 
 #include "cr-utils.h"
 
@@ -66,5 +65,4 @@ void cr_parsing_location_destroy (CRParsingLocation *a_this) ;
 
 
 
-G_END_DECLS
-#endif
+G_END_DECLS
\ No newline at end of file

diff --git a/src/st/croco/cr-prop-list.h b/src/st/croco/cr-prop-list.h
index 797ba43eab11f807bc1f6821623175b169adc284..5b3ad221595b2e31b09f7148f6f464d3fd8f52d4 100644 (file)
--- a/src/st/croco/cr-prop-list.h
+++ b/src/st/croco/cr-prop-list.h
@@ -19,8 +19,7 @@
  * See COPYRIGHTS file for copyrights information.
  */
 
-#ifndef __CR_PROP_LIST_H__
-#define __CR_PROP_LIST_H__
+#pragma once
 
 #include "cr-utils.h"
 #include "cr-declaration.h"
@@ -76,5 +75,3 @@ CRPropList * cr_prop_list_unlink (CRPropList *a_this,
 void cr_prop_list_destroy (CRPropList *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_PROP_LIST_H__*/

diff --git a/src/st/croco/cr-pseudo.h b/src/st/croco/cr-pseudo.h
index 8917da45e8d7deaf2e60f8a0b24ce655092829fb..3812d34f9eeeca53cc0839791221b670a9eca67b 100644 (file)
--- a/src/st/croco/cr-pseudo.h
+++ b/src/st/croco/cr-pseudo.h
@@ -20,8 +20,7 @@
  * See COPYRIGHTS file for copyright information
  */
 
-#ifndef __CR_PSEUDO_H__
-#define __CR_PSEUDO_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -60,5 +59,3 @@ void cr_pseudo_dump (CRPseudo const *a_this, FILE *a_fp) ;
 void cr_pseudo_destroy (CRPseudo *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_PSEUDO_H__*/

diff --git a/src/st/croco/cr-rgb.h b/src/st/croco/cr-rgb.h
index a77e30992fe171032c5a9606e1b2bc3cc8d077e9..8bda8b916d3313a357646771dbab656e2273bea0 100644 (file)
--- a/src/st/croco/cr-rgb.h
+++ b/src/st/croco/cr-rgb.h
@@ -20,8 +20,7 @@
  * see COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_RGB_H__
-#define __CR_RGB_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -80,5 +79,3 @@ void cr_rgb_dump (CRRgb const *a_this, FILE *a_fp) ;
 void cr_rgb_destroy (CRRgb *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_RGB_H__*/

diff --git a/src/st/croco/cr-selector.h b/src/st/croco/cr-selector.h
index 0731e1b80834d2e80363497e49742f61d863a900..3dcc21b85492c50f4d123b3bf5f2aa8780235501 100644 (file)
--- a/src/st/croco/cr-selector.h
+++ b/src/st/croco/cr-selector.h
@@ -22,8 +22,7 @@
  * See COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_SELECTOR_H__
-#define __CR_SELECTOR_H__
+#pragma once
 
 #include <stdio.h>
 #include "cr-utils.h"
@@ -88,5 +87,3 @@ gboolean cr_selector_unref (CRSelector *a_this) ;
 void cr_selector_destroy (CRSelector *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_SELECTOR_H__*/

diff --git a/src/st/croco/cr-simple-sel.h b/src/st/croco/cr-simple-sel.h
index 72b15fd1f25bf8dc7875b0d96095b520f6eed8d0..691b4d9433a4ddaf2694780f99e6d2d261b769e8 100644 (file)
--- a/src/st/croco/cr-simple-sel.h
+++ b/src/st/croco/cr-simple-sel.h
@@ -22,8 +22,7 @@
  */
 
 
-#ifndef __CR_SEL_H__
-#define __CR_SEL_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -125,6 +124,3 @@ enum CRStatus cr_simple_sel_compute_specificity (CRSimpleSel *a_this) ;
 void cr_simple_sel_destroy (CRSimpleSel *a_this) ;
 
 G_END_DECLS
-
-
-#endif /*__CR_SIMPLE_SEL_H__*/

diff --git a/src/st/croco/cr-statement.h b/src/st/croco/cr-statement.h
index c5bec977f790763de5c04f431a838266122d8cc1..58fe6a3676973779ccb59032320901a6daf88265 100644 (file)
--- a/src/st/croco/cr-statement.h
+++ b/src/st/croco/cr-statement.h
@@ -27,8 +27,7 @@
 #include "cr-selector.h"
 #include "cr-declaration.h"
 
-#ifndef __CR_STATEMENT_H__
-#define __CR_STATEMENT_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -436,5 +435,3 @@ void
 cr_statement_destroy (CRStatement *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_STATEMENT_H__*/

diff --git a/src/st/croco/cr-string.h b/src/st/croco/cr-string.h
index 2700f0e2ebc2f41031ce820b65e7cbf295004b58..4c6ab0b00049502ec30436aaa2514cbd5d6cce4f 100644 (file)
--- a/src/st/croco/cr-string.h
+++ b/src/st/croco/cr-string.h
@@ -25,8 +25,7 @@
  *Declaration file of the #CRString class.
  */
 
-#ifndef __CR_STRING_H__
-#define __CR_STRING_H__
+#pragma once
 
 #include <glib.h>
 #include "cr-utils.h"
@@ -72,5 +71,3 @@ gint cr_string_peek_raw_str_len (CRString const *a_this) ;
 void cr_string_destroy (CRString *a_this) ;
 
 G_END_DECLS
-
-#endif 

diff --git a/src/st/croco/cr-stylesheet.h b/src/st/croco/cr-stylesheet.h
index 2d6b4fa0f68faee6d35196cffa100cdecb083818..47d8761af0b78a5eceaec777d8e363be0c7c0452 100644 (file)
--- a/src/st/croco/cr-stylesheet.h
+++ b/src/st/croco/cr-stylesheet.h
@@ -21,8 +21,7 @@
  */
 
 
-#ifndef __CR_STYLESHEET_H__
-#define __CR_STYLESHEET_H__
+#pragma once
 
 #include "cr-utils.h"
 #include "cr-statement.h"
@@ -98,5 +97,3 @@ gboolean cr_stylesheet_unref (CRStyleSheet *a_this) ;
 void cr_stylesheet_destroy (CRStyleSheet *a_this) ;
 
 G_END_DECLS
-
-#endif /*__CR_STYLESHEET_H__*/

diff --git a/src/st/croco/cr-term.h b/src/st/croco/cr-term.h
index 0f22dda758d0f2af4d3166f89a0c9915509416c9..32d1b35ffadf84863d92728be64eda9fcd75eb78 100644 (file)
--- a/src/st/croco/cr-term.h
+++ b/src/st/croco/cr-term.h
@@ -28,8 +28,7 @@
 #include "cr-num.h"
 #include "cr-string.h"
 
-#ifndef __CR_TERM_H__
-#define __CR_TERM_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -186,5 +185,3 @@ gboolean cr_term_unref (CRTerm *a_this) ;
 void cr_term_destroy (CRTerm * a_term) ;
 
 G_END_DECLS
-
-#endif /*__CR_TERM_H__*/

diff --git a/src/st/croco/cr-tknzr.h b/src/st/croco/cr-tknzr.h
index 13985b30ecc1185522df9dad3a49de416cfcf4a0..666c8f0348253629f3df4b796d3e30056ae7db55 100644 (file)
--- a/src/st/croco/cr-tknzr.h
+++ b/src/st/croco/cr-tknzr.h
@@ -27,8 +27,7 @@
  *class.
  */
 
-#ifndef __CR_TKNZR_H__
-#define __CR_TKNZR_H__
+#pragma once
 
 #include "cr-utils.h"
 #include "cr-input.h"
@@ -111,5 +110,3 @@ enum CRStatus cr_tknzr_get_input (CRTknzr *a_this, CRInput **a_input) ;
 void cr_tknzr_destroy (CRTknzr *a_this) ;
        
 G_END_DECLS
-
-#endif /*__CR_TKZNR_H__*/

diff --git a/src/st/croco/cr-token.h b/src/st/croco/cr-token.h
index f1257b7a8da11a576891ab09edcc660b61cf980a..76eb62d98e04d5db956c0aac3bd9c21ed155ef14 100644 (file)
--- a/src/st/croco/cr-token.h
+++ b/src/st/croco/cr-token.h
@@ -21,8 +21,7 @@
  * See COPYRIGHTS file for copyright information.
  */
 
-#ifndef __CR_TOKEN_H__
-#define __CR_TOKEN_H__
+#pragma once
 
 #include "cr-utils.h"
 #include "cr-input.h"
@@ -208,5 +207,3 @@ cr_token_destroy (CRToken *a_this) ;
         
        
 G_END_DECLS
-
-#endif /*__CR_TOKEN_H__*/

diff --git a/src/st/croco/cr-utils.h b/src/st/croco/cr-utils.h
index 54aa24973828e6b8960e94cfd95726fd0db787c4..e57e35c92ce329f54ccc31aaae25876c4f294899 100644 (file)
--- a/src/st/croco/cr-utils.h
+++ b/src/st/croco/cr-utils.h
@@ -21,8 +21,7 @@
  * Look at file COPYRIGHTS for copyright information
  */
 
-#ifndef __CR_DEFS_H__
-#define __CR_DEFS_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -242,5 +241,3 @@ GList *
 cr_utils_dup_glist_of_cr_string (GList const * a_list_of_strings) ;
 
 G_END_DECLS
-
-#endif /*__CR_DEFS_H__*/

diff --git a/src/st/croco/libcroco.h b/src/st/croco/libcroco.h
index 6187a7cb91f0d093029fa702d7d57edecbd9d071..1c644b36e46df5d9152e9956e528bd0dd1518730 100644 (file)
--- a/src/st/croco/libcroco.h
+++ b/src/st/croco/libcroco.h
@@ -18,8 +18,7 @@
  * USA
  */
 
-#ifndef __LIBCROCO_H__
-#define __LIBCROCO_H__
+#pragma once
 
 #include "libcroco-config.h"
 
@@ -38,5 +37,3 @@
 #include "cr-om-parser.h"
 #include "cr-prop-list.h"
 #include "cr-string.h"
-
-#endif /*__LIBCROCO_H__*/

diff --git a/src/st/st-adjustment.h b/src/st/st-adjustment.h
index 08a0fc30a2892a085d67541e460e03c74ebb3e29..68e7a330bd643f7537c216be38f03b4dc95a73e8 100644 (file)
--- a/src/st/st-adjustment.h
+++ b/src/st/st-adjustment.h
@@ -22,8 +22,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_ADJUSTMENT_H__
-#define __ST_ADJUSTMENT_H__
+#pragma once
 
 #include <glib-object.h>
 #include <clutter/clutter.h>
@@ -88,5 +87,3 @@ void                st_adjustment_remove_transition (StAdjustment      *adjustme
                                                      const char        *name);
 
 G_END_DECLS
-
-#endif /* __ST_ADJUSTMENT_H__ */

diff --git a/src/st/st-bin.h b/src/st/st-bin.h
index 7784f45b3d6cf5f585e32b6d809a85cbc432a79d..8316ac0758e868f61cfcca2a2128b1026a8fc93e 100644 (file)
--- a/src/st/st-bin.h
+++ b/src/st/st-bin.h
@@ -21,8 +21,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_BIN_H__
-#define __ST_BIN_H__
+#pragma once
 
 #include <st/st-types.h>
 #include <st/st-widget.h>
@@ -49,5 +48,3 @@ void          st_bin_set_child     (StBin        *bin,
 ClutterActor *st_bin_get_child     (StBin        *bin);
 
 G_END_DECLS
-
-#endif /* __ST_BIN_H__ */

diff --git a/src/st/st-border-image.h b/src/st/st-border-image.h
index 9c581522f343501c7b941cf69522b6b0bc59d190..005695f998cb33830612f88ed598a288f7971bd2 100644 (file)
--- a/src/st/st-border-image.h
+++ b/src/st/st-border-image.h
@@ -18,8 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_BORDER_IMAGE_H__
-#define __ST_BORDER_IMAGE_H__
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -50,5 +49,3 @@ gboolean st_border_image_equal (StBorderImage *image,
                                 StBorderImage *other);
 
 G_END_DECLS
-
-#endif /* __ST_BORDER_IMAGE_H__ */

diff --git a/src/st/st-box-layout.h b/src/st/st-box-layout.h
index 82f5a70457979437009f822f379767e606a6e53e..f268d802736f72ba4c8f30793474fa6f279c6422 100644 (file)
--- a/src/st/st-box-layout.h
+++ b/src/st/st-box-layout.h
@@ -22,8 +22,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef _ST_BOX_LAYOUT_H
-#define _ST_BOX_LAYOUT_H
+#pragma once
 
 #include <st/st-widget.h>
 #include <st/st-viewport.h>
@@ -61,5 +60,3 @@ void     st_box_layout_set_pack_start (StBoxLayout *box,
 gboolean st_box_layout_get_pack_start (StBoxLayout *box);
 
 G_END_DECLS
-
-#endif /* _ST_BOX_LAYOUT_H */

diff --git a/src/st/st-button.h b/src/st/st-button.h
index 3f7dbb0009ae34d67c2f5d1f0e8f0b05b9646b5d..74aa391e4f80aedbd31855b7eb54a94987be502f 100644 (file)
--- a/src/st/st-button.h
+++ b/src/st/st-button.h
@@ -22,8 +22,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_BUTTON_H__
-#define __ST_BUTTON_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -81,5 +80,3 @@ void         st_button_set_button_mask (StButton     *button,
 StButtonMask st_button_get_button_mask (StButton     *button);
 
 G_END_DECLS
-
-#endif /* __ST_BUTTON_H__ */

diff --git a/src/st/st-clipboard.h b/src/st/st-clipboard.h
index 022b8323d3cf6743430156cf7a9fbced6271a1d0..67d2e2b14e4e1e16988ed060c5db58f0a7fe8d46 100644 (file)
--- a/src/st/st-clipboard.h
+++ b/src/st/st-clipboard.h
@@ -21,8 +21,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef _ST_CLIPBOARD_H
-#define _ST_CLIPBOARD_H
+#pragma once
 
 #include <glib-object.h>
 #include <meta/meta-selection.h>
@@ -101,5 +100,3 @@ void st_clipboard_get_content (StClipboard                    *clipboard,
 void st_clipboard_set_selection (MetaSelection *selection);
 
 G_END_DECLS
-
-#endif /* _ST_CLIPBOARD_H */

diff --git a/src/st/st-drawing-area.h b/src/st/st-drawing-area.h
index e09f9c5b283f3ffcfaecb3222e1b6c5eb08313a8..fa5adccbeff60dfb035caa79d2a2c5cad30c30a8 100644 (file)
--- a/src/st/st-drawing-area.h
+++ b/src/st/st-drawing-area.h
@@ -18,8 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_DRAWING_AREA_H__
-#define __ST_DRAWING_AREA_H__
+#pragma once
 
 #include "st-widget.h"
 #include <cairo.h>
@@ -40,5 +39,3 @@ cairo_t *st_drawing_area_get_context      (StDrawingArea *area);
 void     st_drawing_area_get_surface_size (StDrawingArea *area,
                                            guint         *width,
                                            guint         *height);
-
-#endif /* __ST_DRAWING_AREA_H__ */

diff --git a/src/st/st-entry.h b/src/st/st-entry.h
index 2a05759d5048c80afa8302cdc1a741b4ca3506e5..b0958bbab17f1d079782186d5db494e63b218417 100644 (file)
--- a/src/st/st-entry.h
+++ b/src/st/st-entry.h
@@ -21,8 +21,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_ENTRY_H__
-#define __ST_ENTRY_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -76,4 +75,3 @@ void            st_entry_set_cursor_func    (StEntryCursorFunc func,
 
 G_END_DECLS
 
-#endif /* __ST_ENTRY_H__ */

diff --git a/src/st/st-focus-manager.h b/src/st/st-focus-manager.h
index ba8442b56c6d31b3a7065fd323943230bd569aea..36ec8e0a75c06f5d1833ed151bb2f5fb03439e0c 100644 (file)
--- a/src/st/st-focus-manager.h
+++ b/src/st/st-focus-manager.h
@@ -22,8 +22,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_FOCUS_MANAGER_H__
-#define __ST_FOCUS_MANAGER_H__
+#pragma once
 
 #include <st/st-types.h>
 #include <st/st-widget.h>
@@ -61,5 +60,3 @@ gboolean        st_focus_manager_navigate_from_event (StFocusManager *manager,
                                                       ClutterEvent   *event);
 
 G_END_DECLS
-
-#endif /* __ST_FOCUS_MANAGER_H__ */

diff --git a/src/st/st-generic-accessible.h b/src/st/st-generic-accessible.h
index 99a6a71471740013127808fb6cba8484b5c108a6..b180c05fb10f60ec41726bd93977dfbe481d7314 100644 (file)
--- a/src/st/st-generic-accessible.h
+++ b/src/st/st-generic-accessible.h
@@ -21,8 +21,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_GENERIC_ACCESSIBLE_H__
-#define __ST_GENERIC_ACCESSIBLE_H__
+#pragma once
 
 #include <clutter/clutter.h>
 #include <st/st-widget-accessible.h>
@@ -58,5 +57,3 @@ GType       st_generic_accessible_get_type         (void) G_GNUC_CONST;
 AtkObject*  st_generic_accessible_new_for_actor (ClutterActor *actor);
 
 G_END_DECLS
-
-#endif /* __ST_GENERIC_ACCESSIBLE_H__ */

diff --git a/src/st/st-icon-cache.h b/src/st/st-icon-cache.h
index 7bb5cf4dced6a5626b3ac0c26dab2ea7af1c77a7..9d5e14eb4578530e98d147c79b27cbc92846934e 100644 (file)
--- a/src/st/st-icon-cache.h
+++ b/src/st/st-icon-cache.h
@@ -14,8 +14,7 @@
  * You should have received a copy of the GNU Library General Public
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef __ST_ICON_CACHE_H__
-#define __ST_ICON_CACHE_H__
+#pragma once
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -45,5 +44,3 @@ GdkPixbuf * st_icon_cache_get_icon (StIconCache *cache,
 
 StIconCache *st_icon_cache_ref (StIconCache *cache);
 void st_icon_cache_unref (StIconCache *cache);
-
-#endif /* __ST_ICON_CACHE_H__ */

diff --git a/src/st/st-icon-colors.h b/src/st/st-icon-colors.h
index 36e1e677fd90516573f5334f9fa591a3b5d03f79..f1cd4e84cdab30d4730407ebb28e6a93f1174ac9 100644 (file)
--- a/src/st/st-icon-colors.h
+++ b/src/st/st-icon-colors.h
@@ -1,6 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-#ifndef __ST_ICON_COLORS__
-#define __ST_ICON_COLORS__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -37,5 +36,3 @@ gboolean      st_icon_colors_equal (StIconColors *colors,
                                     StIconColors *other);
 
 G_END_DECLS
-
-#endif /* __ST_ICON_COLORS__ */

diff --git a/src/st/st-icon.h b/src/st/st-icon.h
index 2b27ec8af1996a4339546a1e638545dfd246df1e..f80c5b4cc4debdcfc8531de30e30b4d6f0ef48a8 100644 (file)
--- a/src/st/st-icon.h
+++ b/src/st/st-icon.h
@@ -25,8 +25,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef _ST_ICON
-#define _ST_ICON
+#pragma once
 
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -80,5 +79,3 @@ gboolean     st_icon_get_is_symbolic (StIcon *icon);
 
 G_END_DECLS
 
-#endif /* _ST_ICON */
-

diff --git a/src/st/st-image-content.h b/src/st/st-image-content.h
index 0ebb0b74ff78c78ae4ef8a0d7dfab3320a9fe832..84b594e1b82640bbdf19d82b1c7b88aa6d5a1e54 100644 (file)
--- a/src/st/st-image-content.h
+++ b/src/st/st-image-content.h
@@ -18,8 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_IMAGE_CONTENT_H__
-#define __ST_IMAGE_CONTENT_H__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -29,5 +28,3 @@ G_DECLARE_FINAL_TYPE (StImageContent, st_image_content,
 
 ClutterContent *st_image_content_new_with_preferred_size (int width,
                                                           int height);
-
-#endif /* __ST_IMAGE_CONTENT_H__ */

diff --git a/src/st/st-label.h b/src/st/st-label.h
index 456ad3144bdd6d27a557fb60d33db73d2940c8f2..504a78a132fcd777e68a2dfceb7793c23da12c82 100644 (file)
--- a/src/st/st-label.h
+++ b/src/st/st-label.h
@@ -21,8 +21,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_LABEL_H__
-#define __ST_LABEL_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -55,4 +54,3 @@ ClutterActor * st_label_get_clutter_text (StLabel     *label);
 
 G_END_DECLS
 
-#endif /* __ST_LABEL_H__ */

diff --git a/src/st/st-password-entry.h b/src/st/st-password-entry.h
index 399806808592a5047867129c7563156128e7230e..38cccadec4e6a07a8d27f81589c6defb514f6deb 100644 (file)
--- a/src/st/st-password-entry.h
+++ b/src/st/st-password-entry.h
@@ -21,8 +21,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_PASSWORD_ENTRY_H__
-#define __ST_PASSWORD_ENTRY_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -41,6 +40,3 @@ void                st_password_entry_set_show_peek_icon         (StPasswordEntr
                                                                   gboolean         value);
 
 G_END_DECLS
-
-#endif /* __ST_PASSWORD_ENTRY_H__ */
-

diff --git a/src/st/st-private.h b/src/st/st-private.h
index 2ed84a257b1b83c0e935b4c7e69d8dce61fbeb0a..214105a44053cd03fdfd69fde93054408c20c4bc 100644 (file)
--- a/src/st/st-private.h
+++ b/src/st/st-private.h
@@ -20,8 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_PRIVATE_H__
-#define __ST_PRIVATE_H__
+#pragma once
 
 #include <glib.h>
 #include <cairo.h>
@@ -73,5 +72,3 @@ void _st_paint_shadow_with_opacity (StShadow         *shadow_spec,
                                     CoglPipeline     *shadow_pipeline,
                                     ClutterActorBox  *box,
                                     guint8            paint_opacity);
-
-#endif /* __ST_PRIVATE_H__ */

diff --git a/src/st/st-scroll-bar.h b/src/st/st-scroll-bar.h
index 2c69fdd2ae9edddf03079eb729cda4a2d11ba3fa..6360c5afe690be2afed9be48497f6a5ca7c86c1a 100644 (file)
--- a/src/st/st-scroll-bar.h
+++ b/src/st/st-scroll-bar.h
@@ -22,8 +22,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_SCROLL_BAR_H__
-#define __ST_SCROLL_BAR_H__
+#pragma once
 
 #include <st/st-adjustment.h>
 #include <st/st-widget.h>
@@ -49,5 +48,3 @@ void          st_scroll_bar_set_adjustment (StScrollBar  *bar,
 StAdjustment *st_scroll_bar_get_adjustment (StScrollBar  *bar);
 
 G_END_DECLS
-
-#endif /* __ST_SCROLL_BAR_H__ */

diff --git a/src/st/st-scroll-view-fade.h b/src/st/st-scroll-view-fade.h
index 2c65a77631d0bac5ec21c4a9cf282282db999d08..92d5c2450a3a1336ea833eb4cf6e2c9f2827967e 100644 (file)
--- a/src/st/st-scroll-view-fade.h
+++ b/src/st/st-scroll-view-fade.h
@@ -18,8 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_SCROLL_VIEW_FADE_H__
-#define __ST_SCROLL_VIEW_FADE_H__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -32,5 +31,3 @@ G_DECLARE_FINAL_TYPE (StScrollViewFade, st_scroll_view_fade,
 ClutterEffect *st_scroll_view_fade_new (void);
 
 G_END_DECLS
-
-#endif /* __ST_SCROLL_VIEW_FADE_H__ */

diff --git a/src/st/st-scrollable.h b/src/st/st-scrollable.h
index 797ec7db06c3dfadb1b667c344c3df41014403df..25fcabf2ec8b779abaca1175f0f599f0574675e1 100644 (file)
--- a/src/st/st-scrollable.h
+++ b/src/st/st-scrollable.h
@@ -22,8 +22,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_SCROLLABLE_H__
-#define __ST_SCROLLABLE_H__
+#pragma once
 
 #include <glib-object.h>
 #include <st/st-adjustment.h>
@@ -55,5 +54,3 @@ void st_scrollable_get_adjustments (StScrollable  *scrollable,
                                     StAdjustment **vadjustment);
 
 G_END_DECLS
-
-#endif /* __ST_SCROLLABLE_H__ */

diff --git a/src/st/st-settings.h b/src/st/st-settings.h
index 272a4ad39a3ada62236cfe0875105ed319055480..c871c4884b535696439d9bf5b303329fed345cf7 100644 (file)
--- a/src/st/st-settings.h
+++ b/src/st/st-settings.h
@@ -21,8 +21,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_SETTINGS_H__
-#define __ST_SETTINGS_H__
+#pragma once
 
 #include <glib-object.h>
 #include <gdesktop-enums.h>
@@ -57,5 +56,3 @@ void st_settings_inhibit_animations (StSettings *settings);
 void st_settings_uninhibit_animations (StSettings *settings);
 
 G_END_DECLS
-
-#endif /* __ST_SETTINGS_H__ */

diff --git a/src/st/st-shadow.h b/src/st/st-shadow.h
index e201b6e067c4264fc2f206931188689e14202aa5..5075bf2aceb2ccf97c97cfb02382464e101640da 100644 (file)
--- a/src/st/st-shadow.h
+++ b/src/st/st-shadow.h
@@ -18,8 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_SHADOW__
-#define __ST_SHADOW__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -91,5 +90,3 @@ void            st_shadow_helper_paint (StShadowHelper   *helper,
                                         uint8_t           paint_opacity);
 
 G_END_DECLS
-
-#endif /* __ST_SHADOW__ */

diff --git a/src/st/st-texture-cache.h b/src/st/st-texture-cache.h
index 1c5be957c4ef399db9c71026c69d88cf36268492..3b5702bed344e0720a3f8329aa49cbeb3db841b8 100644 (file)
--- a/src/st/st-texture-cache.h
+++ b/src/st/st-texture-cache.h
@@ -19,8 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_TEXTURE_CACHE_H__
-#define __ST_TEXTURE_CACHE_H__
+#pragma once
 
 #if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
 #error "Only <st/st.h> can be included directly.h"
@@ -112,5 +111,3 @@ CoglTexture * st_texture_cache_load (StTextureCache       *cache,
                                      GError              **error);
 
 gboolean st_texture_cache_rescan_icon_theme (StTextureCache *cache);
-
-#endif /* __ST_TEXTURE_CACHE_H__ */

diff --git a/src/st/st-theme-context.h b/src/st/st-theme-context.h
index 3e4709e4ca9357ea39b6a07a809b66a104ef830d..96bbd76a3f2308fd1f141ec35acb258a0e42cb24 100644 (file)
--- a/src/st/st-theme-context.h
+++ b/src/st/st-theme-context.h
@@ -19,8 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_THEME_CONTEXT_H__
-#define __ST_THEME_CONTEXT_H__
+#pragma once
 
 #include <clutter/clutter.h>
 #include <pango/pango.h>
@@ -65,5 +64,3 @@ StThemeNode *               st_theme_context_intern_node      (StThemeContext
 int st_theme_context_get_scale_factor (StThemeContext *context);
 
 G_END_DECLS
-
-#endif /* __ST_THEME_CONTEXT_H__ */

diff --git a/src/st/st-theme-node-private.h b/src/st/st-theme-node-private.h
index 9a910089cd61850a6fb19f903cd0b30aa05e81c3..d95284e201af93ea76902d45cee12b755d761fbf 100644 (file)
--- a/src/st/st-theme-node-private.h
+++ b/src/st/st-theme-node-private.h
@@ -19,8 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_THEME_NODE_PRIVATE_H__
-#define __ST_THEME_NODE_PRIVATE_H__
+#pragma once
 
 #include "st-theme-node.h"
 #include "croco/libcroco.h"
@@ -124,5 +123,3 @@ void _st_theme_node_apply_margins (StThemeNode *node,
                                    ClutterActor *actor);
 
 G_END_DECLS
-
-#endif /* __ST_THEME_NODE_PRIVATE_H__ */

diff --git a/src/st/st-theme-node-transition.h b/src/st/st-theme-node-transition.h
index 6a468f6631003c47f711ccec8ac282703e28e693..fe79f1283efd41a16c49b94ac79405f6b8ce2974 100644 (file)
--- a/src/st/st-theme-node-transition.h
+++ b/src/st/st-theme-node-transition.h
@@ -18,8 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_THEME_NODE_TRANSITION_H__
-#define __ST_THEME_NODE_TRANSITION_H__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -55,5 +54,3 @@ void  st_theme_node_transition_get_paint_box (StThemeNodeTransition *transition,
 StThemeNodePaintState * st_theme_node_transition_get_new_paint_state (StThemeNodeTransition *transition);
 
 G_END_DECLS
-
-#endif

diff --git a/src/st/st-theme-node.h b/src/st/st-theme-node.h
index df923d7b5d2c1ed1aa67ba4a8c41627691f6b733..c34fac133adf4899caf7caddfc3f1eab733038c7 100644 (file)
--- a/src/st/st-theme-node.h
+++ b/src/st/st-theme-node.h
@@ -20,8 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_THEME_NODE_H__
-#define __ST_THEME_NODE_H__
+#pragma once
 
 #include <clutter/clutter.h>
 #include "st-border-image.h"
@@ -365,5 +364,3 @@ void st_theme_node_paint_state_set_node (StThemeNodePaintState *state,
                                          StThemeNode           *node);
 
 G_END_DECLS
-
-#endif /* __ST_THEME_NODE_H__ */

diff --git a/src/st/st-theme-private.h b/src/st/st-theme-private.h
index 2083a7c84ec7e0b447641f6dbf479d76a9132192..771236fd5b3dae9a803c72de3ea878fc2adbe2f3 100644 (file)
--- a/src/st/st-theme-private.h
+++ b/src/st/st-theme-private.h
@@ -18,8 +18,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ST_THEME_PRIVATE_H__
-#define __ST_THEME_PRIVATE_H__
+#pragma once
 
 #include "croco/libcroco.h"
 #include "st-theme.h"
@@ -37,5 +36,3 @@ GFile *_st_theme_resolve_url (StTheme      *theme,
 CRDeclaration *_st_theme_parse_declaration_list (const char *str);
 
 G_END_DECLS
-
-#endif /* __ST_THEME_PRIVATE_H__ */

diff --git a/src/st/st-theme.h b/src/st/st-theme.h
index d3f242c2d222556c10e815f1c78639171b0b80bc..af595db0bc049f94ca44db44e5a99e74759213da 100644 (file)
--- a/src/st/st-theme.h
+++ b/src/st/st-theme.h
@@ -17,8 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef __ST_THEME_H__
-#define __ST_THEME_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -47,5 +46,3 @@ void      st_theme_unload_stylesheet      (StTheme *theme, GFile *file);
 GSList   *st_theme_get_custom_stylesheets (StTheme *theme);
 
 G_END_DECLS
-
-#endif /* __ST_THEME_H__ */

diff --git a/src/st/st-types.h b/src/st/st-types.h
index 5f5ee2dfd14648235139601c3c9e8c84798e2fee..52731978eaade3193ab849c155ce5448308ef800 100644 (file)
--- a/src/st/st-types.h
+++ b/src/st/st-types.h
@@ -14,13 +14,13 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef __ST_TYPES_H__
-#define __ST_TYPES_H__
 
 #if !defined(ST_H_INSIDE) && !defined(ST_COMPILATION)
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
+#pragma once
+
 #include <glib-object.h>
 #include <clutter/clutter.h>
 
@@ -41,5 +41,3 @@ typedef enum {
 } StBackgroundSize;
 
 G_END_DECLS
-
-#endif /* __ST_TYPES_H__ */

diff --git a/src/st/st-widget-accessible.h b/src/st/st-widget-accessible.h
index ad1e62bbba916e9210699c5bd82395dbe103cd91..e3d00187c1e0957fd816ada0578ece40b0d4f8d2 100644 (file)
--- a/src/st/st-widget-accessible.h
+++ b/src/st/st-widget-accessible.h
@@ -22,8 +22,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_WIDGET_ACCESSIBLE_H__
-#define __ST_WIDGET_ACCESSIBLE_H__
+#pragma once
 
 G_BEGIN_DECLS
 
@@ -72,5 +71,3 @@ struct _StWidgetAccessibleClass
 GType st_widget_accessible_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
-
-#endif /* __ST_WIDGET_ACCESSIBLE_H__ */

diff --git a/src/st/st-widget.h b/src/st/st-widget.h
index a1d575cb1f28b8747b928e2aa8425d0004ccffe5..2d9f1464252f0522974b51a06f974e317e298cc9 100644 (file)
--- a/src/st/st-widget.h
+++ b/src/st/st-widget.h
@@ -25,8 +25,7 @@
 #error "Only <st/st.h> can be included directly.h"
 #endif
 
-#ifndef __ST_WIDGET_H__
-#define __ST_WIDGET_H__
+#pragma once
 
 #include <clutter/clutter.h>
 #include <st/st-types.h>
@@ -154,5 +153,3 @@ void                  st_widget_add_accessible_state     (StWidget    *widget,
 void                  st_widget_remove_accessible_state  (StWidget    *widget,
                                                           AtkStateType state);
 G_END_DECLS
-
-#endif /* __ST_WIDGET_H__ */

diff --git a/src/tray/na-tray-child.h b/src/tray/na-tray-child.h
index 7ff8a8d1d0a894df5e43700a8ed90db3385304b2..8d76e78ef737e0537e23d623b46ac095b50e5720 100644 (file)
--- a/src/tray/na-tray-child.h
+++ b/src/tray/na-tray-child.h
@@ -18,8 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NA_TRAY_CHILD_H__
-#define __NA_TRAY_CHILD_H__
+#pragma once
 
 #include "na-xembed.h"
 
@@ -41,5 +40,3 @@ void na_tray_child_emulate_event (NaTrayChild *tray_child,
                                  ClutterEvent *event);
 
 G_END_DECLS
-
-#endif /* __NA_TRAY_CHILD_H__ */

diff --git a/src/tray/na-tray-manager.h b/src/tray/na-tray-manager.h
index de3eae2c4b95e36fe0dbaa341dda50041264dffc..e5d06c2b115b4c7516775f30854284c06f493e76 100644 (file)
--- a/src/tray/na-tray-manager.h
+++ b/src/tray/na-tray-manager.h
@@ -19,8 +19,7 @@
  * Used to be: eggtraymanager.h
  */
 
-#ifndef __NA_TRAY_MANAGER_H__
-#define __NA_TRAY_MANAGER_H__
+#pragma once
 
 #include <clutter/clutter.h>
 
@@ -42,5 +41,3 @@ void na_tray_manager_set_colors (NaTrayManager *manager,
                                  CoglColor     *success);
 
 G_END_DECLS
-
-#endif /* __NA_TRAY_MANAGER_H__ */

diff --git a/src/tray/na-xembed.h b/src/tray/na-xembed.h
index f6b9bc0f4324da9e21bbe7dc814f85001d8a965b..4466305aa5618694856dd0ef37d5337e005eeca0 100644 (file)
--- a/src/tray/na-xembed.h
+++ b/src/tray/na-xembed.h
@@ -18,8 +18,7 @@
  * Author: Carlos Garnacho <carlosg@gnome.org>
  */
 
-#ifndef NA_XEMBED_H
-#define NA_XEMBED_H
+#pragma once
 
 #include <meta/meta-x11-display.h>
 #include <glib-object.h>
@@ -62,6 +61,4 @@ void na_xembed_get_size (NaXembed *xembed,
 void na_xembed_set_background_color (NaXembed        *xembed,
                                      const CoglColor *color);
 
-G_END_DECLS
-
-#endif /* NA_XEMBED_H */
+G_END_DECLS
\ No newline at end of file